Reduce code; fix arguments