Code review cleanup (LEV-169)