Improve code,