refactored to maker
More refactorings