Start refactoring/improving init code