Code cleanup ColorView