#60 partial cleanup of molecule node constructors