Needs some clean-up

image