clean up the code to follow 80 characters per line