[Issue 090714000] Tidy up code base