Simple fix to accomplish DRY