Comments and code cleanup complete.