Fix violations reported by Cane

https://github.com/square/cane