Got rid of Room

Didn't follow the convention