Further cleans up js