Changes some styles and naming
Does several refactorings to shorten methods lenght