Fixed ipool

Signed-off-by: Robert Wettstädt <robert.wett@gmail.com>
Refactoring

Signed-off-by: Robert Wettstädt <robert.wett@gmail.com>