Code cleanup and made gameplay easier