remove/refactor code, format comment