Small refactor and comment