clean up and split up colors in circle class