Clean up code to keep lines short.