Cleaning up a few chunks of code.