Get rid of n+1 call. Clean up code.