Going on in cleaning up the code.