minor cleanup issue
better comments