Some further improvements, making comments look better