Follow coding conventions