Working on improving comment look and feel