More commenting and clean-up