code cleaning: no lines more than 80 characters