Moved initial assignment of private fields to inside the constructor.