Ah, ok, np then. Its at least quite a bit cleaner and readable now, so that can wait.