Refactor init (((TEST)))