started some code cleanup