Optimized several redundancies