Refining
Cleaning up structure
Color change commented out. Further refinement