removed commented code, added meaningful comments