General cleanp up

Signed-off-by: Anthony Anderson <LordIllyohs@gmail.com>