Style, comments, small improvements

Good to know