JS refactoring

Created by: dzaporozhets