Fix comment and uninitialised variable usage