Refactoring picture decorator class.