misc
cleanup to JS