refactor and comments #110