Aesthetic editing and code up clean