Performed code cleanup