Refactoring out unneeded params