src refact