Fix coding conventions