Cleanup + some minor changes