Improved indenting (including fix to #66)