Introduced constants to avoid repetition
Removed finished TODO comments
Introduced new variable instead of modifying passed in variable
Moved comment to a different line

(Sonar clean up item)
Reviewer : Cyrus Venn Casada