#21 refactoring of mojos