refine code

1 job for issue_128 in 3 minutes and 12 seconds (queued for 5 seconds)