Rename flow, remove useless comments