Removed graphite/carbon logging, and fixed some whitespace issues