Reorganizes some logic in order to eliminate code duplication
Reorganizes some logic in order to eliminate code duplication

Signed-off-by: Jon Stovell <5fe09b7d9f00fd95250ae2a73993b352b084988d@gmail.com>

StealthWombat/SMF2.1-more-forkery,StealthWombat/SMF2.1-more-forkery