Changes

Remove some uneccessary code
Tidied lines
Signed-off-by: Tim Argentino <ninjaoctocow@gmail.com>