FEND-882 Code review comments