Get rid of uninitialized variables and unintended override