More code cleaning. Commenting methods.
Minor refactoring