Updated in-class member initialization
Minor modifications.