Cleaned up options().