Attempted code cleanup.