Added more refactoring
Ugh stupidity