Ups, forgot about no encoding...
Fix formatting per style described in header