Cleaned up options