removed and updated comments