General commenting and clean up.