Cleaned up a couple current switch circuity