Refactoring

Renaming
Redundant declaration deleting
Documentation imposition