Clean up and started a BDD approach