finish comment and minor cleanup