Minor tweak to init()