Cleaner spacing combinators
Use paddedChar wherever possible
Fix inconsistent indentation