Cleaned description and added todo