some code cleanup and tune the fuzz value down to 5 minutes