Remove comment and fix scope