Tidy up restoreWindowGeometry

Refs #9970
Improve variable names

Refs #9970