additions / cleanup