Refactoring for the address

 - more style fixes;
 - new constructor(string, short);