Code cleanup

80 character margins