Replace cli() decorator; minor PEP8 fix