Slight refactor.

Still doing a bit more.

Signed-off-by: Kepler Sticka-Jones <kbsj269@gmail.com>