Tidy up some methods