ACCESS: General cleanup of Room class