Optimized and cleaned up some resolution references