Refactor and comment scaffold