Refactored startup system #111.