Nice job extracting reused code