changed comments layout
follow functional, comments done