Removed extra way of parsing CLI options.. removed TODOs from main