During Gerrit reviews, comments were provided that are aligned to best practices and we would like to ensure the changes are made; however, they don't impact the functioning of the code. This is a story to collect those comments for completion during.