Small code cleanup changes