From 2db6cf51e52219711f4d17c587556b9fca3a9737 Mon Sep 17 00:00:00 2001
From: dmacias72 <derekmacias@live.com>
Date: Sat, 22 Oct 2016 00:20:12 -0600
Subject: [PATCH] format and consolidate code