Clean up Javascript
Clean up specs