Cleanup

Whitespace, spelling, width argument consistency