Go.m mods
Tidying up