Simplified stream manager attributes. Also cleaned up code.