refacto: various MR comments

2 jobs for feature/ws-refacto in 12 minutes and 25 seconds (queued for 2 seconds)