Move some stuff in address ctrl into constructor
Some minor cleanups