Reorganised angreal code