Commented and cleaned up names.