Fixed most of the 'line too long warnings'