Fixed formatting and general clean-up.