Ease indentation with emacs
Header file alignment fixups
Return is not a function