Clean up and added point method