Improve remote shell command
Wrap formatting methods in module