Reindent all the things. Also tweak style.rb