init - get rid of some unnecessary code