Improved Commenting; refactored