Little cleanup and restructuration.