documentation, clean-ups