Refactor and clean up comments.