Add autoload markers
Fix weird unstandard parenthesis style