Some refactoring in preparation for deployment
Some refactoring in preparation for deployment