Remove some duplication in controller update methods