did some code cleanup changes