Cleaned up code in MRML classes