Some more cleanup. Max 80 columns.