More Refactoring

#25 will be addressed here in the deploy class refactor