Cleaning up code - enforcing 80 character limit