Cleaned up some output, removed some uneeded processing