Clean up some methods