Refactor useless splat args and clean up specs