removed todo comments from the code