Optimized 41 and cleaned up 85