Minor preformance increase (Complies with findbugs level 17 now)