Refactoring

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>