Cleaning up more code.