Refactor :shipit: