Conform to coding conventions