Small refactor for debugging purposes