CE-702 Removing limit 20 as default is 1, plus minor corrections - coding conventions