Fixing comments, simplifying reflection