Removed repeated code
Follow up changes relating to adding in new show repeat options