Some cleanup. Starting actual room class.