[UNICORN STUFF] refactoring: function params and right