updating to comply with 1-line-between defs in a class, under protest because 2 lines are better demarkation, but standards are standards