cleaned up some n+1s