removed todo comments and added documentation