Tidied code for new deployment system
Tidied code for new deployment system