refactor some checkout module methods

I noticed those methods (written by me some time ago) can be refactored. The first one is a simple improvement, the second one does an extra check since `self.state.present?` is already checked into `has_checkout_step?(self.state)` method called immediately after.