Sicke refactor