Feature/refactoring representor

@fosdev please review and merge.