Cleaned up the startup phase a bit