Cleanup
Works better if I add the Javascript