slightly refactor, no functional changes