Simplified and removed extra JS