Cleanup

Changed variable names to better fit Python. Added comments.