Fix formatting, remove unneeded variables