some minor cleanup and some added documentation hints