fix commons-cli implementation
add comments
cleanup