Did some cleaning & Added forgotten comments