Refactor container start

General prep for other refactoring, make container start nicer, no functional changes