CON-301 | Small cleanup in code