Refactoring of pool tab