minor cleanup w/init