Cleanup + minor changes