Refactor validations for Picture