Fix function name
Split large function