Reindenting and removing some compiler warnings