Some reformatting
Remove some unneeded code