added countries and clean code