Fix code sniffer errors and other minor issues.