Cleaned up option list