Refactoring - cleaning up whitespace