Fix indent and whitespaces