Fix / cleanup
in class update