Fix lines too long + a few comments / style (minor)