Improve the code, comments.