Clean up address initializers
Clean up address initializers (but still broken)