Refine whitespace and remove fixed fields