Clean up Command Line Interface
Release v0.2