No real changes, just prefer initializing members when declaring them instead of doing it in the ctor.