Refactoring (reordered methods)
Added abbreviation for new US states