reformatting and remove the unnecessary case