cleanup

cleaned up and shortened long lines