Removed commented out code + added some comments