Refactoring, getting ready to deploy