refactoring: remove unneeded null check
refactoring: simplify address concatenation