Clean up and better checking adding