Fix Formatting, update autoload