More helper refactoring