clear up unneccessary codes and comment