Cleaned up code and colors