Remove unused scope variable, add newline and warning numbers