New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup