Made some changes to the formatter for readability

Newlines per Sami's request.