Modified code to follow 80-column rule