<all> refactoring done