Fix style issues
Add ###autoload markers