A lot of clean ups :P

Signed-off-by: Captain Shadows <captain_shadows@aol.com>