Fix indent and whitespace issues