Refactoring JS-files and more