some comments/cleanup