Init: refactored further