A small refactoring + adding comments.