ROOMS-16: Clean up text