Code cleanup
Corrected setting waitroom