Refactored for me

Signed-off-by: Don Redhorse <dredhorse@breiden.net>