Go ahead and simplify these two blocks.
Merge pull request #23 from fedora-infra/feature/simplify

Go ahead and simplify these two blocks.