Improve comments, remove logs