Refactor startup helpers