tiny improvement. removing some useless assignments