[fix/code_sniffer] Fix code_sniffer complaints
Merge pull request #176 from marc1706/fix/code_sniffer

[fix/code_sniffer] Fix code_sniffer complaints