Some tidying up. Removed switch for setting the status property.