Clean up option processing