Render address postal as well
Clean TODOs