some cleanup - and use english consistently