whoops, fixed some stuff

I accidentally included some stuff from when I was testing, and I formatted my code to fit the code styling requirements.