Style changes to make code sniffer happy