Make temps in sync in case add more temps, minor: comment/var rename