Refactor com.michalrus.helper