Comments and clean up.