Clean up some code to remove a bunch of stuff that doesn't need to be public.
Fixed cleanUp code to actually clean up everything.
Changed member variables access from "_" to "self." style.

Signed-off-by: Scott Gustafson <scott@garlicsoftware.com>