quite refactoring done