cleaned up some methods