Cold Mould, refatored some glass usage