removal of unused Idents param
Added functions, removed nesting
Merge branch 'ruudvanderweijde-master'