Cleanup, changed accessability modifiers.