Finished minor improvement of functional KMP