Final commenting and minor cleanup