Reformatted according to PhetStyle.xml, see #36