Refactoring.. Adding some newlines