Clean up options better