Move main class back to AnvilCleaner, misc code formatting