Second revision

clean up