Cleanup + small update