[REQS-676] Code tidy-up