color scheme changes, code cleanup