add comments and reorder spring properties