[Parser] Modified option processing

Made more sense moving all the processing into a single function