Clean up & Update
Be precise