Reviewed changes, comment cleanup