POI class refactoring

cleanup