[REQS-609] Tidy up codes