constify / cleanup