added colors!
cleaned up