Fix intendation and whitespaces