Added Code Formatter, formatted code and ran cleanup