Little cleanup and reorg