First round of refactoring for 'start' command