refractoring of the front end modules to keep with immutable style of the back end