Refactor value/status update in ControlGenerator to one method. #58