refactor dalsza czesc + decorations