JavaScripts slightly refactored