comment cleanup:-)