Clean up author/format logic