Change comments and add indents to composer