Category Refactoring
Category JS Refactoring