Path updates, code cleanup.