Updated, clean code with solid pipeline