MAL-33 | Fix code review warnings