Fixed code sniffer warnings
(cherry picked from commit 09bab0c)