Continued refactoring
More refactors