optimized js, not-arranged class unnecessary now