Refactoring

+ Englishing a little bit closer
+ Namespacing a little bit better

Signed-off-by: Ramón Ramos <arathael@gmail.com>