Refactoring funs :)