Richard Harrah:
	- cleaning up some methods
