cleaned up a few things, mostly spacing and indentation