Improve code form