Added trailing underscore to decorator names
Added trailing underscore to decorator name
Minor tweaks