[REFACTORING]Make it more slim