Cleaning up some methods