Improved documentation for command line params
Fixed refactor