color kept with shape; some cleanup