Organize js some