more comments, more code clean-up