Follow our own advice and use kwargs