Cleaned up, added lap no. to best lap