adding todo comments and taking out unnecessary comments