diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82816f3..b5c9b23 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,11 +2,16 @@ name: Build
 
 on:
   push:
+    branches:
+      - master
     paths:
       - 'library/src/**'
       - 'pom.xml'
       - '.github/**'
+
   pull_request:
+    branches:
+      - master
     paths:
       - 'library/src/**'
       - 'pom.xml'
diff --git a/library/src/main/java/com/tomaytotomato/model/City.java b/library/src/main/java/com/tomaytotomato/model/City.java
index 7b1444d..0c8275a 100644
--- a/library/src/main/java/com/tomaytotomato/model/City.java
+++ b/library/src/main/java/com/tomaytotomato/model/City.java
@@ -32,210 +32,94 @@ public class City implements Serializable {
    */
   City() {}
 
-  /**
-   * Gets the unique identifier of the city.
-   *
-   * @return the city's unique ID
-   */
   public Integer getId() {
     return id;
   }
 
-  /**
-   * Sets the unique identifier of the city.
-   *
-   * @param id the unique ID to set for the city
-   */
   public void setId(Integer id) {
     this.id = id;
   }
 
-  /**
-   * Gets the unique identifier of the country associated with the city.
-   *
-   * @return the country's unique ID
-   */
   public Integer getCountryId() {
     return countryId;
   }
 
-  /**
-   * Sets the unique identifier of the country associated with the city.
-   *
-   * @param countryId the unique ID to set for the country
-   */
   public void setCountryId(Integer countryId) {
     this.countryId = countryId;
   }
 
-  /**
-   * Gets the name of the country associated with the city.
-   *
-   * @return the country's name
-   */
   public String getCountryName() {
     return countryName;
   }
 
-  /**
-   * Sets the name of the country associated with the city.
-   *
-   * @param countryName the name to set for the country
-   */
   public void setCountryName(String countryName) {
     this.countryName = countryName;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-2 code of the country associated with the city.
-   *
-   * @return the country's ISO2 code
-   */
   public String getCountryIso2Code() {
     return countryIso2Code;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-2 code of the country associated with the city.
-   *
-   * @param countryIso2Code the ISO2 code to set for the country
-   */
   public void setCountryIso2Code(String countryIso2Code) {
     this.countryIso2Code = countryIso2Code;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-3 code of the country associated with the city.
-   *
-   * @return the country's ISO3 code
-   */
   public String getCountryIso3Code() {
     return countryIso3Code;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-3 code of the country associated with the city.
-   *
-   * @param countryIso3Code the ISO3 code to set for the country
-   */
   public void setCountryIso3Code(String countryIso3Code) {
     this.countryIso3Code = countryIso3Code;
   }
 
-  /**
-   * Gets the unique identifier of the state associated with the city.
-   *
-   * @return the state's unique ID
-   */
   public Integer getStateId() {
     return stateId;
   }
 
-  /**
-   * Sets the unique identifier of the state associated with the city.
-   *
-   * @param stateId the unique ID to set for the state
-   */
   public void setStateId(Integer stateId) {
     this.stateId = stateId;
   }
 
-  /**
-   * Gets the code of the state associated with the city.
-   *
-   * @return the state's code
-   */
   public String getStateCode() {
     return stateCode;
   }
 
-  /**
-   * Sets the code of the state associated with the city.
-   *
-   * @param stateCode the code to set for the state
-   */
   public void setStateCode(String stateCode) {
     this.stateCode = stateCode;
   }
 
-  /**
-   * Gets the name of the state associated with the city.
-   *
-   * @return the state's name
-   */
   public String getStateName() {
     return stateName;
   }
 
-  /**
-   * Sets the name of the state associated with the city.
-   *
-   * @param stateName the name to set for the state
-   */
   public void setStateName(String stateName) {
     this.stateName = stateName;
   }
 
-  /**
-   * Gets the name of the city.
-   *
-   * @return the name of the city
-   */
   public String getName() {
     return name;
   }
 
-  /**
-   * Sets the name of the city.
-   *
-   * @param name the name to set for the city
-   */
   public void setName(String name) {
     this.name = name;
   }
 
-  /**
-   * Gets the latitude of the city.
-   *
-   * @return the city's latitude
-   */
   public BigDecimal getLatitude() {
     return latitude;
   }
 
-  /**
-   * Sets the latitude of the city.
-   *
-   * @param latitude the latitude to set for the city
-   */
   public void setLatitude(BigDecimal latitude) {
     this.latitude = latitude;
   }
 
-  /**
-   * Gets the longitude of the city.
-   *
-   * @return the city's longitude
-   */
   public BigDecimal getLongitude() {
     return longitude;
   }
 
-  /**
-   * Sets the longitude of the city.
-   *
-   * @param longitude the longitude to set for the city
-   */
   public void setLongitude(BigDecimal longitude) {
     this.longitude = longitude;
   }
 
-  /**
-   * Checks whether two city objects are equal based on their attributes.
-   *
-   * @param o the object to compare with
-   * @return true if the objects are equal, false otherwise
-   */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -256,11 +140,6 @@ public boolean equals(Object o) {
         getLongitude(), city.getLongitude());
   }
 
-  /**
-   * Computes the hash code for the city object based on its attributes.
-   *
-   * @return the hash code of the city
-   */
   @Override
   public int hashCode() {
     return Objects.hash(getId(), getCountryId(), getCountryName(), getCountryIso2Code(),
diff --git a/library/src/main/java/com/tomaytotomato/model/Country.java b/library/src/main/java/com/tomaytotomato/model/Country.java
index 8ac08d7..e1bb9a1 100644
--- a/library/src/main/java/com/tomaytotomato/model/Country.java
+++ b/library/src/main/java/com/tomaytotomato/model/Country.java
@@ -42,467 +42,208 @@ public class Country implements Serializable {
   private String emoji;
   private String emojiU;
 
-  /**
-   * Default constructor for Country.
-   */
   Country() {}
 
-  /**
-   * Gets the unique identifier of the country.
-   *
-   * @return the country's unique ID
-   */
   public int getId() {
     return id;
   }
 
-  /**
-   * Sets the unique identifier of the country.
-   *
-   * @param id the unique ID to set for the country
-   */
   public void setId(int id) {
     this.id = id;
   }
 
-  /**
-   * Gets the name of the country.
-   *
-   * @return the name of the country
-   */
   public String getName() {
     return name;
   }
 
-  /**
-   * Sets the name of the country.
-   *
-   * @param name the name to set for the country
-   */
   public void setName(String name) {
     this.name = name;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-3 code of the country.
-   *
-   * @return the country's ISO3 code
-   */
   public String getIso3() {
     return iso3;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-3 code of the country.
-   *
-   * @param iso3 the ISO3 code to set for the country
-   */
   public void setIso3(String iso3) {
     this.iso3 = iso3;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-2 code of the country.
-   *
-   * @return the country's ISO2 code
-   */
   public String getIso2() {
     return iso2;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-2 code of the country.
-   *
-   * @param iso2 the ISO2 code to set for the country
-   */
   public void setIso2(String iso2) {
     this.iso2 = iso2;
   }
 
-  /**
-   * Gets the zone name of the country.
-   *
-   * @return the country's zone name
-   */
   public String getZoneName() {
     return zoneName;
   }
 
-  /**
-   * Sets the zone name of the country.
-   *
-   * @param zoneName the zone name to set for the country
-   */
   public void setZoneName(String zoneName) {
     this.zoneName = zoneName;
   }
 
-  /**
-   * Gets the phone code of the country.
-   *
-   * @return the country's phone code
-   */
   public String getPhoneCode() {
     return phoneCode;
   }
 
-  /**
-   * Sets the phone code of the country.
-   *
-   * @param phoneCode the phone code to set for the country
-   */
   public void setPhoneCode(String phoneCode) {
     this.phoneCode = phoneCode;
   }
 
-  /**
-   * Gets the numeric code of the country.
-   *
-   * @return the country's numeric code
-   */
   public String getNumericCode() {
     return numericCode;
   }
 
-  /**
-   * Sets the numeric code of the country.
-   *
-   * @param numericCode the numeric code to set for the country
-   */
   public void setNumericCode(String numericCode) {
     this.numericCode = numericCode;
   }
 
-  /**
-   * Gets the capital city of the country.
-   *
-   * @return the capital of the country
-   */
   public String getCapital() {
     return capital;
   }
 
-  /**
-   * Sets the capital city of the country.
-   *
-   * @param capital the capital to set for the country
-   */
   public void setCapital(String capital) {
     this.capital = capital;
   }
 
-  /**
-   * Gets the currency code of the country.
-   *
-   * @return the country's currency code
-   */
   public String getCurrency() {
     return currency;
   }
 
-  /**
-   * Sets the currency code of the country.
-   *
-   * @param currency the currency code to set for the country
-   */
   public void setCurrency(String currency) {
     this.currency = currency;
   }
 
-  /**
-   * Gets the name of the country's currency.
-   *
-   * @return the name of the currency
-   */
   public String getCurrencyName() {
     return currencyName;
   }
 
-  /**
-   * Sets the name of the country's currency.
-   *
-   * @param currencyName the name to set for the currency
-   */
   public void setCurrencyName(String currencyName) {
     this.currencyName = currencyName;
   }
 
-  /**
-   * Gets the symbol of the country's currency.
-   *
-   * @return the currency symbol
-   */
   public String getCurrencySymbol() {
     return currencySymbol;
   }
 
-  /**
-   * Sets the symbol of the country's currency.
-   *
-   * @param currencySymbol the symbol to set for the currency
-   */
   public void setCurrencySymbol(String currencySymbol) {
     this.currencySymbol = currencySymbol;
   }
 
-  /**
-   * Gets the top-level domain (TLD) of the country.
-   *
-   * @return the country's TLD
-   */
   public String getTld() {
     return tld;
   }
 
-  /**
-   * Sets the top-level domain (TLD) of the country.
-   *
-   * @param tld the TLD to set for the country
-   */
   public void setTld(String tld) {
     this.tld = tld;
   }
 
-  /**
-   * Gets the native name of the country.
-   *
-   * @return the country's native name
-   */
   public String getNativeName() {
     return nativeName;
   }
 
-  /**
-   * Sets the native name of the country.
-   *
-   * @param nativeName the native name to set for the country
-   */
   public void setNativeName(String nativeName) {
     this.nativeName = nativeName;
   }
 
-  /**
-   * Gets the region where the country is located.
-   *
-   * @return the country's region
-   */
   public String getRegion() {
     return region;
   }
 
-  /**
-   * Sets the region where the country is located.
-   *
-   * @param region the region to set for the country
-   */
   public void setRegion(String region) {
     this.region = region;
   }
 
-  /**
-   * Gets the region ID where the country is located.
-   *
-   * @return the country's region ID
-   */
   public String getRegionId() {
     return regionId;
   }
 
-  /**
-   * Sets the region ID where the country is located.
-   *
-   * @param regionId the region ID to set for the country
-   */
   public void setRegionId(String regionId) {
     this.regionId = regionId;
   }
 
-  /**
-   * Gets the subregion where the country is located.
-   *
-   * @return the country's subregion
-   */
   public String getSubregion() {
     return subregion;
   }
 
-  /**
-   * Sets the subregion where the country is located.
-   *
-   * @param subregion the subregion to set for the country
-   */
   public void setSubregion(String subregion) {
     this.subregion = subregion;
   }
 
-  /**
-   * Gets the subregion ID where the country is located.
-   *
-   * @return the country's subregion ID
-   */
   public String getSubregionId() {
     return subregionId;
   }
 
-  /**
-   * Sets the subregion ID where the country is located.
-   *
-   * @param subregionId the subregion ID to set for the country
-   */
   public void setSubregionId(String subregionId) {
     this.subregionId = subregionId;
   }
 
-  /**
-   * Gets the list of states within the country.
-   *
-   * @return a list of the country's states
-   */
   public List<State> getStates() {
     return states;
   }
 
-  /**
-   * Sets the list of states within the country.
-   *
-   * @param states the list of states to set for the country
-   */
   public void setStates(List<State> states) {
     this.states = states;
   }
 
-  /**
-   * Gets the nationality associated with the country.
-   *
-   * @return the country's nationality
-   */
   public String getNationality() {
     return nationality;
   }
 
-  /**
-   * Sets the nationality associated with the country.
-   *
-   * @param nationality the nationality to set for the country
-   */
   public void setNationality(String nationality) {
     this.nationality = nationality;
   }
 
-  /**
-   * Gets the list of time zones within the country.
-   *
-   * @return a list of the country's time zones
-   */
   public List<TimeZone> getTimezones() {
     return timezones;
   }
 
-  /**
-   * Sets the list of time zones within the country.
-   *
-   * @param timezones the list of time zones to set for the country
-   */
   public void setTimezones(List<TimeZone> timezones) {
     this.timezones = timezones;
   }
 
-  /**
-   * Gets the translations of the country's name.
-   *
-   * @return a map of translations for the country's name
-   */
   public Map<String, String> getTranslations() {
     return translations;
   }
 
-  /**
-   * Sets the translations of the country's name.
-   *
-   * @param translations the map of translations to set for the country's name
-   */
   public void setTranslations(Map<String, String> translations) {
     this.translations = translations;
   }
 
-  /**
-   * Gets the latitude of the country's geographic center.
-   *
-   * @return the country's latitude
-   */
   public BigDecimal getLatitude() {
     return latitude;
   }
 
-  /**
-   * Sets the latitude of the country's geographic center.
-   *
-   * @param latitude the latitude to set for the country
-   */
   public void setLatitude(BigDecimal latitude) {
     this.latitude = latitude;
   }
 
-  /**
-   * Gets the longitude of the country's geographic center.
-   *
-   * @return the country's longitude
-   */
   public BigDecimal getLongitude() {
     return longitude;
   }
 
-  /**
-   * Sets the longitude of the country's geographic center.
-   *
-   * @param longitude the longitude to set for the country
-   */
   public void setLongitude(BigDecimal longitude) {
     this.longitude = longitude;
   }
 
-  /**
-   * Gets the emoji representing the country.
-   *
-   * @return the country's emoji
-   */
   public String getEmoji() {
     return emoji;
   }
 
-  /**
-   * Sets the emoji representing the country.
-   *
-   * @param emoji the emoji to set for the country
-   */
   public void setEmoji(String emoji) {
     this.emoji = emoji;
   }
 
-  /**
-   * Gets the Unicode representation of the country's emoji.
-   *
-   * @return the Unicode representation of the emoji
-   */
   public String getEmojiU() {
     return emojiU;
   }
 
-  /**
-   * Sets the Unicode representation of the country's emoji.
-   *
-   * @param emojiU the Unicode representation to set for the emoji
-   */
   public void setEmojiU(String emojiU) {
     this.emojiU = emojiU;
   }
 
-  /**
-   * Checks whether two country objects are equal based on their attributes.
-   *
-   * @param o the object to compare with
-   * @return true if the objects are equal, false otherwise
-   */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -532,11 +273,6 @@ public boolean equals(Object o) {
         country.getEmojiU());
   }
 
-  /**
-   * Computes the hash code for the country object based on its attributes.
-   *
-   * @return the hash code of the country
-   */
   @Override
   public int hashCode() {
     return Objects.hash(getId(), getName(), getIso3(), getIso2(), getZoneName(), getPhoneCode(),
diff --git a/library/src/main/java/com/tomaytotomato/model/Location.java b/library/src/main/java/com/tomaytotomato/model/Location.java
index 4065ebc..3b823ce 100644
--- a/library/src/main/java/com/tomaytotomato/model/Location.java
+++ b/library/src/main/java/com/tomaytotomato/model/Location.java
@@ -63,237 +63,106 @@ public Location(String countryName, Integer countryId, String countryIso2Code,
     this.longitude = longitude;
   }
 
-  /**
-   * Gets the name of the country.
-   *
-   * @return the name of the country
-   */
   public String getCountryName() {
     return countryName;
   }
 
-  /**
-   * Sets the name of the country.
-   *
-   * @param countryName the name to set for the country
-   */
   public void setCountryName(String countryName) {
     this.countryName = countryName;
   }
 
-  /**
-   * Gets the unique identifier of the country.
-   *
-   * @return the country's unique ID
-   */
   public Integer getCountryId() {
     return countryId;
   }
 
-  /**
-   * Sets the unique identifier of the country.
-   *
-   * @param countryId the unique ID to set for the country
-   */
   public void setCountryId(Integer countryId) {
     this.countryId = countryId;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-2 code of the country.
-   *
-   * @return the country's ISO2 code
-   */
   public String getCountryIso2Code() {
     return countryIso2Code;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-2 code of the country.
-   *
-   * @param countryIso2Code the ISO2 code to set for the country
-   */
   public void setCountryIso2Code(String countryIso2Code) {
     this.countryIso2Code = countryIso2Code;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-3 code of the country.
-   *
-   * @return the country's ISO3 code
-   */
   public String getCountryIso3Code() {
     return countryIso3Code;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-3 code of the country.
-   *
-   * @param countryIso3Code the ISO3 code to set for the country
-   */
   public void setCountryIso3Code(String countryIso3Code) {
     this.countryIso3Code = countryIso3Code;
   }
 
-  /**
-   * Gets the name of the state.
-   *
-   * @return the name of the state
-   */
   public String getState() {
     return state;
   }
 
-  /**
-   * Sets the name of the state.
-   *
-   * @param state the name to set for the state
-   */
   public void setState(String state) {
     this.state = state;
   }
 
-  /**
-   * Gets the unique identifier of the state.
-   *
-   * @return the state's unique ID
-   */
   public Integer getStateId() {
     return stateId;
   }
 
-  /**
-   * Sets the unique identifier of the state.
-   *
-   * @param stateId the unique ID to set for the state
-   */
   public void setStateId(Integer stateId) {
     this.stateId = stateId;
   }
 
-  /**
-   * Gets the code of the state.
-   *
-   * @return the state's code
-   */
   public String getStateCode() {
     return stateCode;
   }
 
-  /**
-   * Sets the code of the state.
-   *
-   * @param stateCode the code to set for the state
-   */
   public void setStateCode(String stateCode) {
     this.stateCode = stateCode;
   }
 
-  /**
-   * Gets the full name of the state.
-   *
-   * @return the state's full name
-   */
   public String getStateName() {
     return stateName;
   }
 
-  /**
-   * Sets the full name of the state.
-   *
-   * @param stateName the full name to set for the state
-   */
   public void setStateName(String stateName) {
     this.stateName = stateName;
   }
 
-  /**
-   * Gets the name of the city.
-   *
-   * @return the name of the city
-   */
   public String getCity() {
     return city;
   }
 
-  /**
-   * Sets the name of the city.
-   *
-   * @param city the name to set for the city
-   */
   public void setCity(String city) {
     this.city = city;
   }
 
-  /**
-   * Gets the unique identifier of the city.
-   *
-   * @return the city's unique ID
-   */
   public Integer getCityId() {
     return cityId;
   }
 
-  /**
-   * Sets the unique identifier of the city.
-   *
-   * @param cityId the unique ID to set for the city
-   */
   public void setCityId(Integer cityId) {
     this.cityId = cityId;
   }
 
-  /**
-   * Gets the latitude of the location.
-   *
-   * @return the latitude of the location
-   */
   public BigDecimal getLatitude() {
     return latitude;
   }
 
-  /**
-   * Sets the latitude of the location.
-   *
-   * @param latitude the latitude to set for the location
-   */
   public void setLatitude(BigDecimal latitude) {
     this.latitude = latitude;
   }
 
-  /**
-   * Gets the longitude of the location.
-   *
-   * @return the longitude of the location
-   */
   public BigDecimal getLongitude() {
     return longitude;
   }
 
-  /**
-   * Sets the longitude of the location.
-   *
-   * @param longitude the longitude to set for the location
-   */
   public void setLongitude(BigDecimal longitude) {
     this.longitude = longitude;
   }
 
-  /**
-   * Creates a new {@link Builder} for constructing a {@link Location} instance.
-   *
-   * @return a new Builder instance
-   */
   public static Builder builder() {
     return new Builder();
   }
 
-  /**
-   * Builder class for constructing instances of {@link Location}.
-   * <p>
-   * This builder allows for setting various attributes before creating a Location object.
-   * </p>
-   */
   public static class Builder {
 
     private String countryName;
@@ -309,148 +178,68 @@ public static class Builder {
     private BigDecimal latitude;
     private BigDecimal longitude;
 
-    /**
-     * Default constructor for Builder.
-     */
     Builder() { }
 
-    /**
-     * Sets the name of the country for the location.
-     *
-     * @param countryName the name of the country
-     * @return the Builder instance
-     */
     public Builder countryName(String countryName) {
       this.countryName = countryName;
       return this;
     }
 
-    /**
-     * Sets the unique identifier of the country for the location.
-     *
-     * @param countryId the unique ID of the country
-     * @return the Builder instance
-     */
     public Builder countryId(Integer countryId) {
       this.countryId = countryId;
       return this;
     }
 
-    /**
-     * Sets the ISO 3166-1 alpha-2 code of the country for the location.
-     *
-     * @param countryIso2Code the ISO2 code of the country
-     * @return the Builder instance
-     */
     public Builder countryIso2Code(String countryIso2Code) {
       this.countryIso2Code = countryIso2Code;
       return this;
     }
 
-    /**
-     * Sets the ISO 3166-1 alpha-3 code of the country for the location.
-     *
-     * @param countryIso3Code the ISO3 code of the country
-     * @return the Builder instance
-     */
     public Builder countryIso3Code(String countryIso3Code) {
       this.countryIso3Code = countryIso3Code;
       return this;
     }
 
-    /**
-     * Sets the name of the state for the location.
-     *
-     * @param state the name of the state
-     * @return the Builder instance
-     */
     public Builder state(String state) {
       this.state = state;
       return this;
     }
 
-    /**
-     * Sets the unique identifier of the state for the location.
-     *
-     * @param stateId the unique ID of the state
-     * @return the Builder instance
-     */
     public Builder stateId(Integer stateId) {
       this.stateId = stateId;
       return this;
     }
 
-    /**
-     * Sets the code of the state for the location.
-     *
-     * @param stateCode the code of the state
-     * @return the Builder instance
-     */
     public Builder stateCode(String stateCode) {
       this.stateCode = stateCode;
       return this;
     }
 
-    /**
-     * Sets the full name of the state for the location.
-     *
-     * @param stateName the full name of the state
-     * @return the Builder instance
-     */
     public Builder stateName(String stateName) {
       this.stateName = stateName;
       return this;
     }
 
-    /**
-     * Sets the name of the city for the location.
-     *
-     * @param city the name of the city
-     * @return the Builder instance
-     */
     public Builder city(String city) {
       this.city = city;
       return this;
     }
 
-    /**
-     * Sets the unique identifier of the city for the location.
-     *
-     * @param cityId the unique ID of the city
-     * @return the Builder instance
-     */
     public Builder cityId(Integer cityId) {
       this.cityId = cityId;
       return this;
     }
 
-    /**
-     * Sets the latitude of the location.
-     *
-     * @param latitude the latitude of the location
-     * @return the Builder instance
-     */
     public Builder latitude(BigDecimal latitude) {
       this.latitude = latitude;
       return this;
     }
 
-    /**
-     * Sets the longitude of the location.
-     *
-     * @param longitude the longitude of the location
-     * @return the Builder instance
-     */
     public Builder longitude(BigDecimal longitude) {
       this.longitude = longitude;
       return this;
     }
 
-    /**
-     * Builds a new {@link Location} instance with the specified attributes.
-     *
-     * @return a new Location object
-     */
     public Location build() {
       return new Location(countryName, countryId, countryIso2Code, countryIso3Code, state, stateId,
           stateCode, stateName, city, cityId, latitude, longitude);
diff --git a/library/src/main/java/com/tomaytotomato/model/State.java b/library/src/main/java/com/tomaytotomato/model/State.java
index 339bf58..11c4738 100644
--- a/library/src/main/java/com/tomaytotomato/model/State.java
+++ b/library/src/main/java/com/tomaytotomato/model/State.java
@@ -64,210 +64,94 @@ public State(Integer id, Integer countryId, String countryName, String countryIs
     this.longitude = longitude;
   }
 
-  /**
-   * Gets the unique identifier of the state.
-   *
-   * @return the state's unique ID
-   */
   public Integer getId() {
     return id;
   }
 
-  /**
-   * Sets the unique identifier of the state.
-   *
-   * @param id the unique ID to set for the state
-   */
   public void setId(Integer id) {
     this.id = id;
   }
 
-  /**
-   * Gets the unique identifier of the country associated with the state.
-   *
-   * @return the country's unique ID
-   */
   public Integer getCountryId() {
     return countryId;
   }
 
-  /**
-   * Sets the unique identifier of the country associated with the state.
-   *
-   * @param countryId the unique ID to set for the country
-   */
   public void setCountryId(Integer countryId) {
     this.countryId = countryId;
   }
 
-  /**
-   * Gets the name of the country associated with the state.
-   *
-   * @return the country's name
-   */
   public String getCountryName() {
     return countryName;
   }
 
-  /**
-   * Sets the name of the country associated with the state.
-   *
-   * @param countryName the name to set for the country
-   */
   public void setCountryName(String countryName) {
     this.countryName = countryName;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-2 code of the country associated with the state.
-   *
-   * @return the country's ISO2 code
-   */
   public String getCountryIso2Code() {
     return countryIso2Code;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-2 code of the country associated with the state.
-   *
-   * @param countryIso2Code the ISO2 code to set for the country
-   */
   public void setCountryIso2Code(String countryIso2Code) {
     this.countryIso2Code = countryIso2Code;
   }
 
-  /**
-   * Gets the ISO 3166-1 alpha-3 code of the country associated with the state.
-   *
-   * @return the country's ISO3 code
-   */
   public String getCountryIso3Code() {
     return countryIso3Code;
   }
 
-  /**
-   * Sets the ISO 3166-1 alpha-3 code of the country associated with the state.
-   *
-   * @param countryIso3Code the ISO3 code to set for the country
-   */
   public void setCountryIso3Code(String countryIso3Code) {
     this.countryIso3Code = countryIso3Code;
   }
 
-  /**
-   * Gets the name of the state.
-   *
-   * @return the name of the state
-   */
   public String getName() {
     return name;
   }
 
-  /**
-   * Sets the name of the state.
-   *
-   * @param name the name to set for the state
-   */
   public void setName(String name) {
     this.name = name;
   }
 
-  /**
-   * Gets the type or classification of the state (e.g., province, region).
-   *
-   * @return the type of the state
-   */
   public String getType() {
     return type;
   }
 
-  /**
-   * Sets the type or classification of the state.
-   *
-   * @param type the type to set for the state
-   */
   public void setType(String type) {
     this.type = type;
   }
 
-  /**
-   * Gets the code of the state.
-   *
-   * @return the state's code
-   */
   public String getStateCode() {
     return stateCode;
   }
 
-  /**
-   * Sets the code of the state.
-   *
-   * @param stateCode the code to set for the state
-   */
   public void setStateCode(String stateCode) {
     this.stateCode = stateCode;
   }
 
-  /**
-   * Gets the list of cities within the state.
-   *
-   * @return a list of cities in the state
-   */
   public List<City> getCities() {
     return cities;
   }
 
-  /**
-   * Sets the list of cities within the state.
-   *
-   * @param cities the list of cities to set for the state
-   */
   public void setCities(List<City> cities) {
     this.cities = cities;
   }
 
-  /**
-   * Gets the latitude of the state's geographic center.
-   *
-   * @return the state's latitude
-   */
   public BigDecimal getLatitude() {
     return latitude;
   }
 
-  /**
-   * Sets the latitude of the state's geographic center.
-   *
-   * @param latitude the latitude to set for the state
-   */
   public void setLatitude(BigDecimal latitude) {
     this.latitude = latitude;
   }
 
-  /**
-   * Gets the longitude of the state's geographic center.
-   *
-   * @return the state's longitude
-   */
   public BigDecimal getLongitude() {
     return longitude;
   }
 
-  /**
-   * Sets the longitude of the state's geographic center.
-   *
-   * @param longitude the longitude to set for the state
-   */
   public void setLongitude(BigDecimal longitude) {
     this.longitude = longitude;
   }
 
-  /**
-   * Checks whether two state objects are equal based on their attributes.
-   *
-   * @param o the object to compare with
-   * @return true if the objects are equal, false otherwise
-   */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -288,11 +172,6 @@ public boolean equals(Object o) {
         && Objects.equals(getLongitude(), state.getLongitude());
   }
 
-  /**
-   * Computes the hash code for the state object based on its attributes.
-   *
-   * @return the hash code of the state
-   */
   @Override
   public int hashCode() {
     return Objects.hash(getId(), getCountryId(), getCountryName(), getCountryIso2Code(),
diff --git a/library/src/main/java/com/tomaytotomato/model/TimeZone.java b/library/src/main/java/com/tomaytotomato/model/TimeZone.java
index 1b53578..87cab92 100644
--- a/library/src/main/java/com/tomaytotomato/model/TimeZone.java
+++ b/library/src/main/java/com/tomaytotomato/model/TimeZone.java
@@ -44,102 +44,46 @@ public TimeZone(String zoneName, String abbreviation, String tzName, Integer gmt
     this.gmtOffsetName = gmtOffsetName;
   }
 
-  /**
-   * Gets the name of the timezone.
-   *
-   * @return the name of the timezone
-   */
   public String getZoneName() {
     return zoneName;
   }
 
-  /**
-   * Sets the name of the timezone.
-   *
-   * @param zoneName the name to set for the timezone
-   */
   public void setZoneName(String zoneName) {
     this.zoneName = zoneName;
   }
 
-  /**
-   * Gets the abbreviation of the timezone.
-   *
-   * @return the abbreviation of the timezone
-   */
   public String getAbbreviation() {
     return abbreviation;
   }
 
-  /**
-   * Sets the abbreviation of the timezone.
-   *
-   * @param abbreviation the abbreviation to set for the timezone
-   */
   public void setAbbreviation(String abbreviation) {
     this.abbreviation = abbreviation;
   }
 
-  /**
-   * Gets the full name of the timezone.
-   *
-   * @return the full name of the timezone
-   */
   public String getTzName() {
     return tzName;
   }
 
-  /**
-   * Sets the full name of the timezone.
-   *
-   * @param tzName the full name to set for the timezone
-   */
   public void setTzName(String tzName) {
     this.tzName = tzName;
   }
 
-  /**
-   * Gets the GMT offset in seconds.
-   *
-   * @return the GMT offset in seconds
-   */
   public Integer getGmtOffset() {
     return gmtOffset;
   }
 
-  /**
-   * Sets the GMT offset in seconds.
-   *
-   * @param gmtOffset the GMT offset to set in seconds
-   */
   public void setGmtOffset(Integer gmtOffset) {
     this.gmtOffset = gmtOffset;
   }
 
-  /**
-   * Gets the human-readable name for the GMT offset.
-   *
-   * @return the name for the GMT offset
-   */
   public String getGmtOffsetName() {
     return gmtOffsetName;
   }
 
-  /**
-   * Sets the human-readable name for the GMT offset.
-   *
-   * @param gmtOffsetName the name to set for the GMT offset
-   */
   public void setGmtOffsetName(String gmtOffsetName) {
     this.gmtOffsetName = gmtOffsetName;
   }
 
-  /**
-   * Checks whether two timezone objects are equal based on their attributes.
-   *
-   * @param o the object to compare with
-   * @return true if the objects are equal, false otherwise
-   */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -155,11 +99,6 @@ public boolean equals(Object o) {
         && Objects.equals(getGmtOffsetName(), timeZone.getGmtOffsetName());
   }
 
-  /**
-   * Computes the hash code for the timezone object based on its attributes.
-   *
-   * @return the hash code of the timezone
-   */
   @Override
   public int hashCode() {
     return Objects.hash(getZoneName(), getAbbreviation(), getTzName(), getGmtOffset(),