Fix indentation
Change variable names
Fix bug
Refactor
Remove some debugging output