Style, comments, small improvements