Final commenting and clean-up.