FIX: all style violations reported by cane 2.6.1