clean-up, add comments