Indentation/80-character column fixes