improved coding conventions