CE-702 Removing limit 20 as default is 1, plus minor corrections - codin...

...g conventions
(old simple forgotten commit comes back to make few lines of code better) ;)