Removed TODO's for color