Handle proper characters
Refactor command line parsing