Always good to to code review and cleanup of legacy code lines as without that it will become unreadable. One more thing I consider to be important is to break the code in multiple classes instead of having one class with thousand of code lines, so hopefully that doesn't happen here.