Fix variable names to be more in line with python standards and fix a line too long