Refactor and fix

too many unnecessary variables! i can call everything on internship instead!