moved comment and minor ops