Cleaned up the hotel client controller