naming/init clean up