removed some inactive line and updated comments