formatting and removed some old methods that were commented out/no
longer in use.