Follow python naming convention
Remove unused variables