Refactoring some more
Refactoring some more