cleanup and comments in MouldAssembly