Some shipping class tidyup