clean up and coverage improve