sd
Refactoring stuff