Changed name of main, refactored method names, formatted classes