Refactor for consistancy