Some cleaning and parameter tunning