Cleaned up/removed some code after move to more complex fprintf.