Simplify joins

It reads a lot better this way