A bunch of indentation and other improvements.