Code clean, reduce complexity