Added execution time and some clean up