Remove unnecessary log
Improve initialization a bit
Add required initializers