Fixes constructors.
Improves coding style.