Reduced needless complexity