Code formatting consistency.
Refactored AddressScreen