Repackaging code for clarity