Cleaned up a few things / code format