review, refactoring and migration to command factories