Refactor what i just made