Fixing white spaces and indentation