Replace cli() decorator; minor PEP8 fix

Tested on Nexis 3000, 5000, and 9000 platforms.