Cleanup
Fixed vars
Moving works