Whitespace cleanup and use to_string instead of to_binary