Refactoring

I haven't tried that yet