source code cleanup to get rid of warnings