Minor restructure with init