cleaning up the code.