Clean up in sample-parser and CLI support in the same