Refactor for readablity

Go back and refactor the code to make better use of deployer and
chaining.  The chaining should make the flow of operations much clearer.