added row/column year formatting, trimmed whitespace