Cleaned up js, and index