performed some code cleanup