Really minor changes with logging and formatting