enhancements after review on github