Improved coding convention and messages.