Cleaning up the code some more.