Feature/implement to allow code sniffer to pass