ENH: remove redundancy, cosmetics, update files with an event