Simplify Address class by using Struct