removed return point, logged helper refactored