cleaned up some init methods