Added linebreaks; More refactoring styles