Refactor: Removing some duplication.