Fixed some odd indenting and made file follow conventions