Clean up option parser