Refactor to eliminate redundant properties