Refactor to be consistent