Small refactoring to make it more GAS-stylish