buttonLap_Click cleaned up