Remove unnecessary member variable for address and fix up formatting issue.