fix space for variable and fix clean