code cleanup

cleaned up code to fit on 80 char lines