Removed commented code
Code reorganization