Refactoring

I did some refactoring about variable and method names and also I did
some code identation