Made symbols local, that were accidentally added to the global namespace.
Also, cleaned up some white-space issues.