did a bit of refactoring. Moving toward better ligthing
did a bit of refactoring. Moving toward better ligthing