City Tackles Water St. Safety after Homicide