Cleaned up code (imports, formatting, etc.)