Modified the target representation, cleanned a bit the code