Clean-up, subroutines, and new colors