Cleaned up map-e and room modules