Init

Init refactoring