Adding USA State abbreviations and removing some unnecessary functions