Made function args more consistent