even more clean-ups and comments