Cleanup + minor updates