remove code comments
improve tests