Cleaned up room editor and room class for better serialization