Refactoring picture decorator.