Rationalizing colour scheme stuff, cleaning up code, commenting