cleaned up and added colors