Minor refactoring
Refactor startup checks