fix comment
code enhancements