MAINT: Updated header information, all files
MAINT: Simplification of timeit