Refactored property address in Helper(s)

A few spacing issues remain, however.