General clean and improvement