code cleanup to better match coding conventions