enhance code after MR comments

2 jobs for tmf-674-feature
in 2 minutes and 13 seconds, using 0 compute credits, and was queued for 3 seconds
latest