Comments & clean-up