small clean and prepare to refactoring