Minor Nick refactor to remove duplicate code