Check for leaky, fixing, formatting