more comments, formatting