Remove global vars, use container instead
Remove extra spaces in JS