Fixed some indentions and use of new lines