Refactored more
More refactoring