Cleaning up syntax, using extend()