Small comments and style changes

Nothing critical