Fix weird unstandard parenthesis style
Add autoload markers