Cleaning up some methods.