Trivial changes, streamlining the code base