Code cleanup
Add support for CLI arguments