Added optparser
Cleanup