Make things simpler