Increased readability.
Merge branch 'master' into omnitropic

* master:
  Increased readability.
Early design experiments