Added useful comments and removed commented out code