Just cleaning up the code.