Cleaning up a few methods.