ClassicalMoulding ported
refactoring