Improve comments layout
Close #87