tidying up some methods