JS validation + polishing