Refactor :D