Add: minor improvements to handle decorator;
Change: no value returning routine to return none automatically;