Update autoload

Fixes race condition in autoload and reduces its size by removing redundant comments