renamed excludeCurrentParam to excludeCurrentParameter & other code cleanup