Intermediate local Check-In - cleaning up code
Cleaned up some more code!