Add clean target and some targets improved