[AESH-104]
more refactoring and more mojo