Performing some renaming and reformating
Merge pull request #4 from siempredelao/siempredelao/renaming

Performing some renaming and reformating