Improving code

Improving methods and variables creation and so on.