removed commented out code, added @todos