Fix exception rescuing in CLI
Fix coding standards
Refactor with Forwardable module