Proper class names, cleaned up js file content