Improve initializer
Fix variables initialization