Toggle code clean up

Toggle code cleaned up, removed copy/paste.