Refactor/comment smell in discussion

Comments removed by renaming variables
Method extracted to make reading of code easier