[REQS-648] Code tidy-up