Code review PR

Limit lines to 100 chars.