Development with Axioms

Refactoring