Reset indentation to 2 spaces and other minor updates.