Fixing code sniffs