refactoring

I hope I know what i'm doing