City of Tampa moving closer to Downtown Riverwalk expansion