source code changed to meet coding conventions