Refactor: Cleaning up some duplication