Improve and update code.