[fix/code_sniffer] Fix code_sniffer complaints