- Cleaned up code from last commit making the process simplier, cleaner,
and much more modular.

Signed-off-by: Nick Hurd <datcodplaya@gmail.com>