Clean up imports, comments, formatting.