Cleans and improves class