Reorganized source for cleanliness.