Move member initialization back into the constructor