Change some var names. Fix indentation.