Save for refactor
A bit cleaner naming and comment touch up.