Ran cleanup. Stage 2, assigned tags; ready for Stage 3 :D

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