Simplify internals of init command a bit