Many many many many cleanups

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