Cleanup. Renaming. Comments added.