Code refactoring and apply static mixins