Harmonify and clean-up JS