Refactor Parallel

Signed-off-by: Maciej Płaza <maciejplaza@fastmail.fm>