Refactored number declarations and added address declaration