Cleaning
Separate new and init
Rename 'deinit' for symmetry with 'init'