refactoring retro piece a little bit