Refactoring and cleaning up with autoload bits