fixed copyright dates
placed annotations on same line for fields/methods