Refactoring, Code Cleanup, Further Implementation of Spout (0.1-D2)