refactoring didn't fix any errors
GOING TO QUIT MODDING FOR SOME TIME NOW