Moderate code cleanup
More degreeking