Yes, it looks ok now.

You won't need all the series - only for the MainLine and SignalLine, for the rest you can use normal variables - but they don't harm either.