Fix layout, remove some comments.