Commenting out the code; refactoring

Commenting out the code and some code refactoring