Refactor methods

Compact lines and remove spanish words in code