cleanup formatting, remove unneeded variable