Not ready, see next commit!
Some minor changes, mostly structure improvement.