Merge pull request #1125 from reaperhulk/rsa-numbers-with-functions

Move some shared logic to functions