[library] Bit of tidy up to aea36b9aa734d5c7d3fb69f43926dbac28453048