Comments & cleanup