Some further refactoring and simplification

Adds: