Add comments, other cleanup