Revert "Let's reformat shall we?"

This reverts commit a10d41cadb2dc1343be1c9a8f264445c989c5216.
Revert "Removed All references to the Spout class execpt EngineFaker"

This reverts commit dc616502fa7d797af4190ee157e6f11724a017da.