small refactoring for more readability
LAZY COMMIT, DELETE AFTER CLEANUP