modifications to satisfy the coding conventions