Merge pull request #177 from apache/kll_minor_cleanup

KLL minor cleanup