Adding documentation; minor clean-up.