Minor refactoring to remove unecessary Proc instantiation