Code cleanup and tweaked animations