Fix variable names + line length