Reorganize --display option validation