Clean up imports, methods, line breaks