#205 whitespace cleanup and the like