Performed some code cleanup