Cleaned up code and changed color values