Fixed indenting, improved format