Minor refactoring to remove comments