Clean up specs
Add JS + scopes