Improved indenting, naming.