various cleanups and cosmetical interventions