Move comments from the line side to the top code line

This patch contains:
fixing a feedback on putting the comments on top of the code instead of beside it.