Refactor argument substitution
Update copyright