Cleaned up coloring a bit