Removed todo, finalized reformatting effort.