Avoid using class initializers

Avoid using class initializers, instead, use constructors.