Performed code clean up.