Fix whitespace/indentation inconsistencies