Refactored save checks into sane single methods