Cleaned up some stuff (comments, names, etc)
Changed colors and other stuff