Refactor plz