Clean up

Ran it with someone fixed issues