Code cleanup, removed debug lines, introduced implicit S to wye.