Original check-in.
General code clean-up.