Internal formatting

All the newlines :D
More formatting

For the good of newlineumanity!