playing around with colors and some general code cleanup