Add dedicated Color class
Cleanups