[REQ-593] Code tidy up