Addressed first comments from @ericsnow
Removed duplicated PublicAddress
Go formatted