Refactor

Hey!

I've made a couple of refactors, could you take a look? :v: