cleanup and doc block corrections