Code review, added some line breaks