Cleanup + Sync David + Ian's changes