Removing duplicated code commented