improve styling of comments and alignment bug
Merge remote-tracking branch 'origin/master'