Fix indent and white spaces