Did some clean up in the code.