Removing some short variables, long variables, and making methods less complex