cleaned up joins