Renaming
Init for magic change
Small refactor