more 80 characters per line fixes