Code cleanup

Minor code cleanup changes