Refactor and Sickbeard support