some cleanup small inline docu added