Improve solution