Small refactoring, added/changes git files - should be ok going forward