MAL-30 | Fix code sniffs