refactoring

+ categorization
+ refactoring