Improved coding conventions